only check sort column id if connected to sortable model.

2006-05-30  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_update_button): only
	check sort column id if connected to sortable model.

diff --git a/ChangeLog b/ChangeLog
index f3882c233c042f0ff92e18fcdac44491ff22ab3e..bafa3eee6e64525d520490b6f91bc9225678b1b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-30  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_update_button): only
+       check sort column id if connected to sortable model.
+
 2006-05-30  Behdad Esfahbod  <behdad@gnome.org>
 
        * gdk/gdkpango.c (draw_error_underline): Fix offset to center the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f3882c233c042f0ff92e18fcdac44491ff22ab3e..bafa3eee6e64525d520490b6f91bc9225678b1b4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-05-30  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_update_button): only
+       check sort column id if connected to sortable model.
+
 2006-05-30  Behdad Esfahbod  <behdad@gnome.org>
 
        * gdk/gdkpango.c (draw_error_underline): Fix offset to center the

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 1fe4e3020b89cf1259f058e6de35b7ef4bf9f452..1b22478f2197907b2163da985ecdfc7ec2cfd1ab 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -848,6 +848,12 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column)
   GtkWidget *arrow;
   GtkWidget *current_child;
   GtkArrowType arrow_type = GTK_ARROW_NONE;
+  GtkTreeModel *model;
+
+  if (tree_column->tree_view)
+    model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree_column->tree_view));
+  else
+    model = NULL;
 
   /* Create a button if necessary */
   if (tree_column->visible &&
@@ -898,9 +904,10 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column)
                                          "");
     }
 
-  if (gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (GTK_TREE_VIEW (tree_column->tree_view)->priv->model),
-                                           &sort_column_id,
-                                           NULL))
+  if (GTK_IS_TREE_SORTABLE (model)
+      && gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (model),
+                                              &sort_column_id,
+                                              NULL))
     {
       if (sort_column_id == tree_column->sort_column_id)
        {
@@ -944,7 +951,7 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column)
     }
   g_object_unref (arrow);
 
-  if (tree_column->sort_column_id >= 0)
+  if (GTK_IS_TREE_SORTABLE (model) && tree_column->sort_column_id >= 0)
     gtk_widget_show (arrow);
   else
     gtk_widget_hide (arrow);